arm64: KVM: Preserve RES1 bits in SCTLR_EL2
authorMarc Zyngier <marc.zyngier@arm.com>
Tue, 6 Jun 2017 18:08:33 +0000 (19:08 +0100)
committerRaspbian kernel package updater <root@raspbian.org>
Sun, 23 Jul 2017 02:54:59 +0000 (02:54 +0000)
commit648bf8a202aa4b2217dee29e823afec356e895cb
tree8c1ae5f82b3e8f9de8690f05243b7dcff2bc5fee
parent9689b3a70d6477eaa97ef221cd1a215a4041d4d4
arm64: KVM: Preserve RES1 bits in SCTLR_EL2

commit d68c1f7fd1b7148dab5fe658321d511998969f2d upstream.

__do_hyp_init has the rather bad habit of ignoring RES1 bits and
writing them back as zero. On a v8.0-8.2 CPU, this doesn't do anything
bad, but may end-up being pretty nasty on future revisions of the
architecture.

Let's preserve those bits so that we don't have to fix this later on.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <cdall@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm64/include/asm/sysreg.h
arch/arm64/kvm/hyp-init.S